Skip to content

add .gitattributes file#45

Merged
markstory merged 4 commits intocakephp:masterfrom
antograssiot:appveyor
Feb 12, 2015
Merged

add .gitattributes file#45
markstory merged 4 commits intocakephp:masterfrom
antograssiot:appveyor

Conversation

@antograssiot
Copy link
Copy Markdown
Contributor

No description provided.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for repeating the indent_style?

Also, why not using something like [*.{json,yml}] since I believe it applies to both?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jadb only .yml require 2 space. Json is 4 space as normal.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

composer.json fo example have 4 spaces I think...

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see 2 spaces being used almost everywhere for json:

https://docs.npmjs.com/misc/coding-style

For example, bower.json is 2 spaces as well.

I noticed now composer init creates it with 4 spaces, not sure why though.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jadb PHP's json_encode() with pretty print option indents using 4 spaces.

@markstory markstory added this to the 1.0.0 milestone Feb 12, 2015
markstory added a commit that referenced this pull request Feb 12, 2015
@markstory markstory merged commit b805565 into cakephp:master Feb 12, 2015
@markstory
Copy link
Copy Markdown
Member

Looks good to me. We can always fiddle with the different file types in future pull requests.

@antograssiot antograssiot deleted the appveyor branch June 6, 2015 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants